Fix overriding a Java method with varargs #2076
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Oops, I forgot to add the testcase, I'll amend the commit. |
If A method like: override def foo(x: Object*) overrides a Java method, it needs to be rewritten as: def foo(x: Seq[Object]) override def foo(x: Array[Object]): Object = foo(Predef.wrapRefArray(x)) This should be handled by ElimRepeated but there were two bugs: - `addVarArgsBridge` was called at phase `thisTransformer.next`, this is too late to create the bridge since `T*` has already been rewritten as `Seq[T]` - The original method symbol needs to have the `override` flag dropped, since it doesn't override anything. Furthermore, RefChecks had to be moved after ElimRepeated, otherwise the testcase would fail the overriding checks.
smarter
force-pushed
the
fix/override-java-varargs
branch
from
c26d2fc to
e5e691e
Compare
This was a mistake introduced in the previous commit, installAfter is only safe to use in `IdentityDenotTransformer` phases, otherwise it means that the phase denotation transformer is not run at all for this particular denotation, this caused Ycheck to fail.
odersky
approved these changes
Mar 12, 2017
smarter
added a commit
to dotty-staging/dotty
that referenced
this pull request
Mar 12, 2017
This wasn't done before because dotty could not compile dottydoc, this got fixed by PRs scala#2070 and scala#2076.
smarter
added a commit
to dotty-staging/dotty
that referenced
this pull request
Mar 12, 2017
This wasn't done before because dotty could not compile dottydoc, this got fixed by PRs scala#2070 and scala#2076.
smarter
added a commit
to dotty-staging/dotty
that referenced
this pull request
Mar 13, 2017
This wasn't done before because dotty could not compile dottydoc, this got fixed by PRs scala#2070 and scala#2076.
smarter
added a commit
to dotty-staging/dotty
that referenced
this pull request
Mar 13, 2017
This wasn't done before because dotty could not compile dottydoc, this got fixed by PRs scala#2070 and scala#2076, and the previous commit fixed a miscompilation issue.
smarter
added a commit
to dotty-staging/dotty
that referenced
this pull request
Mar 14, 2017
This wasn't done before because dotty could not compile dottydoc, this got fixed by PRs scala#2070 and scala#2076, and the previous commit fixed a miscompilation issue.
smarter
added a commit
to dotty-staging/dotty
that referenced
this pull request
Mar 15, 2017
This wasn't done before because dotty could not compile dottydoc, this got fixed by PRs scala#2070 and scala#2076, and the previous commit fixed a miscompilation issue.
smarter
added a commit
to dotty-staging/dotty
that referenced
this pull request
Mar 15, 2017
This wasn't done before because dotty could not compile dottydoc, this got fixed by PRs scala#2070 and scala#2076, and the previous commit fixed a miscompilation issue.
smarter
added a commit
to dotty-staging/dotty
that referenced
this pull request
Mar 15, 2017
This wasn't done before because dotty could not compile dottydoc, this got fixed by PRs scala#2070 and scala#2076, and the previous commit fixed a miscompilation issue.
smarter
added a commit
to dotty-staging/dotty
that referenced
this pull request
Mar 16, 2017
This wasn't done before because dotty could not compile dottydoc, this got fixed by PRs scala#2070 and scala#2076, and the previous commit fixed a miscompilation issue.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If A method like:
overrides a Java method, it needs to be rewritten as:
This should be handled by ElimRepeated but there were two bugs:
addVarArgsBridgewas called at phasethisTransformer.next, this istoo late to create the bridge since
T*has already been rewritten asSeq[T]overrideflag dropped,since it doesn't override anything.
Furthermore, RefChecks had to be moved after ElimRepeated, otherwise
the testcase would fail the overriding checks.
@odersky I'm not sure if moving RefChecks is the best solution here. Alternatively we could teach TypeComparer about repeated params when we compare MethodTypes in a phase before ElimRepeated.